Auto merge of #4145 - rust-lang:matklad-patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 8 Jun 2017 14:54:36 +0000 (14:54 +0000)
committerbors <bors@rust-lang.org>
Thu, 8 Jun 2017 14:54:36 +0000 (14:54 +0000)
commite810012e9b9fc96ebe64bc041654214e0952cca7
tree37e4ca0e56b8098861578030a4c31d411999388d
parent4a79a470a80c30218812d9f2151e9835bbecef94
parent42c83031d7a7c642375528771e0ef1766619fb93
Auto merge of #4145 - rust-lang:matklad-patch-1, r=alexcrichton

Fix flaky test

closes #4144.